Performanc Improvements, bump 2.0.4