working version of refactored Rebond