improvements #4