design changings #144