partially reverted some changes