Updated prototype