improvements #2