Rolled back a few changes