Refactor Fixed