Jak/Mar app fixed