next commit, a little more? last one not working correctly