Adding more bugs to the 'to-do' list
Adding performance fix