Linking all together4 - refactoring