Made some changes to Steve