Re-defining a couple things