made globals consistant with existing code