all new stuff angular implemented