improve from suggestions