aa - updated constants and added initial env props.