Reverting to the original good working code.