added some system specific customization