Reworking angular into index_v2