Temporarily removed conditions for testing