made location an optional info