Refactoring done - need to check