little changes, before sent to Ross