added a bit of functionality
added a bit of functionality
refactored a bit