ADDED: fix design