added the recent updates to src/main directory