UPDATE: roll back to clean base from scratch