updated dev 7