tune up on design aspects