Proto 4; added some stuff