updates to make more angular liek