Changed some disign