FINAL COMMIT EP2