sexy
scripted update of code from master at b152861 sexy