Crazy changes

Made some changes