added the really important stuff