Mainly design Changes