version 2

nl after super (review all)