Slower, bug fix