Changed back to not using the global class