Updated bug hunt