Structure change, bug fix
Adding jumper