Agree, that could be definitely improved!