Updates and 'resets'
Fixed merge conflic