Modularized a little ...