Revised interface