Added inbounding, rebound fixes