major update of Rebond framework