Reverting back to changes made by Johannes