refactored code to make it more generic