Adding some more changes to more easily gather additional features