Cleaned up ekman case