basic work for all screens now update