Small changes according to martas description