Design + minor changes