Updated to the latest angular