Crushed bugs and added few interesting features