Added some changes. Now we are using box for sync stuff