Updated prototype code