another working version
 - some bugs are fixed/....