57 refactored