Adding two step check for PC