Made some changes

Still doesent work right