working on naming issue
fixing nameing issues...