Passed test with extension, need to refactor