changing to fix bugs