rocraild: modifications from Peter