Switch anguar and more prototyping