misc update
Adopt org literal