bug hunting part added