Updated oneBounce twoBounce and bounce fns