Reverted some crap changed