Started on before view
Started on before view, fixed conflicts