Remove bugs and update it for new data