improved(?) angular usage, we got a service now\!