Update to match wolfman's specs

Works just fine...