added back in bugs