work from 30.10_added files