Includes pre-refactor version