Added support for a single screen