jordan and some other fix