Looks better, to be continued?