couple more changes than im done