Reverted some bad changes :(