added standalone capability