completing feature #2