Design improoveeeheeeheheHAHAAHAHHAA...ehm..ed