--more code change for optimization GEP-52