removed up & Roger updated code