Merge with Charles Parse update