hopefuly all issue solvin commit!