Updating standalone repo with latest changes