removed hardcoding and move to new templar