This looks better already!