added shit and made changes