Reverted some things... done for now