Added option to run from Zagreb