Continuing work on [short.codes /]