codes modified & makeups added