@girieshg I'm going to be moving this to an advanced PDF template eventually so I'd like to make it compatible with that as much as possible