Modifications to existing library to support multiple screens