Updated to reflect changes in 1.3