done issues #15,17