Some Design Changes

17/5/14