Updated to include latest changes