Add bounds and proper jumping