A composition including two components is provided. When the two components are admixed in the method of the invention a polymer-modified gypsum composition is provided. The admixture exhibits a useful balance of setting time and stability.