commented re-template function for now