making all da changes