Changed preconditions and post conditions

(requirement for the previous milestone)