changed references from generic to global