Uploaded compatibility code