Changed some design