working on optimization for no.7