added missing $
added TODO