adding removing bugs implemented