PC25 Updated and working