Done with TODO: Javatar IBPFG