modifications according to beta review by client