Design improvment