tiny changes, seems to work well