RWD: General Templete's changes