Testing new function for refactoring