re-working theater and map... again...