changes to jump logic, work in progress