Dev + Refactoring