adding all of what i tried the previous commit