Adding latest source code- to solve syncing problem