Worked on Bugs and API