merged from basho's update