merged physics with masterrr