working version
Bug fiz