Removed template in Same function