yes, line 17 is now 24