Modified design slightly