Fix and some design