Code

Added new TODO and removed invalid attribute