Again just refactored