update from tinkerfuroc