bug fix: now it is a working version