working after corrections from 1/5