Updated

separate code & design