finished issue #56 #57