reverted some things