done commit for now, i will take holiday for 1 day, Lol