Enterprise 1.2

incorporated changes worked on in 2.0