reverted some problems