reverted some unnecessary changes