added rollback to skeleton