Improved several apects