more angular way
lots of improvements, rebrand