attempting to fix bugs