enhance several problems