[@Ammokkx] Made the changes