added limbo feature
fixed conflicts