some updates for new templar, soon will be gone