Updated branch with latest changes for deployment