org added and plugin fix