rkuhn comments applied: no more extension