[Scuba_ref]

20 yards to reach the line to gain; they run it 18 and you tack on 15 for the penalty that adds up to a first down in my book. This is not enforced from the previous spot but from the end of the run!

So, no you did not get it right.