first commit to jelly bean (with all [ray changes)