Reverted some changes