added bundle and custom setting