Merged changes & implemented overlap processing