include JITA & more comments