Added rollback

Attempt 2