UPDATE: adding changes made from pokxe/ng-techgrind today