Or i need to redesign a lot more...