Changes made to make syntax work according to specs and few major changes