finished conversion to new syntax, boot updated