Updated for 1.1.3rc2