more adjustments on passing info to screens