Some disign changes