First method did not cover all use cases.