uncommented out some stuff in those functions