couple things to make it work better