done issues #22, #23