Merged with local and some corrections added