Includes GELAM changes