Start of better screen support.