done issues 51, 52 #51, #52