Some improments, nothing changed logicly