PC16 Updated and changes needed on PC15