Modified to add refactor TODO