added stand alone feature