More work on angular