Complete not refactored