Before trying angular
big advance in angular implementation
build update