minor changes to roll back