Sync the code developed by Prasun