got rid of global: