SCAL-484 - improved look