Main work

Bug fix