595-20

fixed issue and changed a bit