- added JustArchi optimizations