Adding stuff back - refactoring