Quick push, adjusted some conditions