Worked on bugs