Novas branch

Fixed Major Bug1