change syntax on e06, add e07