updated WIP, I extended it a little, NOW I could start polishing it