tabular rates and single image
tiny refactor