Enable JustArchi stuff #2