Updated
Updated with incoming call screhandling