Changed the whole design