Update my own files from JP's