Part of the shitty exchange of un comited changes from yesterday (PMH)

Part of the shitty exchange of un comited changes from yesterday (PMH)