Small changes again in order to match interface
issueID #10