Version 2 (removed ngforms and some fixes).