Screenrewrite

Rebase to IvanSafrin