Modified but messy commit. need to clean , compile and test it. 
It's only beta & not working