Added solutions for EKO and ONP