MARI-12 updated to set location cd properly