adding support for more screens. still not working