Some Changes, removed CONFIG for a while