More code + Bug fix