work ok but need some smal fixes to be presentable