merged with my 1.9.1 handbuilt