updated template function to use actual format instead of requested
-- ffs, wasn't going to do this, darn you!