Rolled back quite a few changes