small changes
almost working