Made some changes (BROKEN)