Changed the way PC is handled