Refactored Project