updated to use screen as well