PR after fixed all issues