First version ... not working 100% correct
Fixed bugs