setupAdd has changed data structure