use rwp to make code more readable
add a speed up dependanicy
Update Changes