giza: adding support for final