improving rollback option, not finish yet