removing some of the changes, since my  new changes dont seem to be working