finished refactoring and unit testing redelivery