little improvements #3