Added handling for second screen