Merged in Coolman Coleman's new changes