optimized rollback concept and tidied up project