Fixed method
Added updating