Change to work with angular