Added bug tracking again