Additional stuff that was missing