Reeverted some changes