More compact and modularized