Rebound working - closes #10