added shit and stuff