altering it back to what I had but with your set up