new little edit just finished still need a few tweeks