now updating screens correctly