first full working version
fix