Attempt to unify masterkorp's changes