improvements #6