sync up with refactored model/main