some angular magic added