changes from Maria
Marias changes part II