on init only
scripted update of code from master at ec4d534 on init only