temporary readd some conditions