Cu refactor

![image](https://f.cloud.github.com/assets/1346122/1814019/8d1ae870-6edd-11e3-98f2-73d2c1545f0c.png)
![image](https://f.cloud.github.com/assets/1346122/1814022/926a2aca-6edd-11e3-900d-bf7deede2810.png)