updating prod and refactoring