Few updates at the end