Change design again. Tidier