Mostly done MC 1.5 update