#5 performance improvement and bug fix