some changes, not solved #52, but trying