+ working on CS5
+ fixed previously commented code