little more work on this..