Version withou some bugs