Revert "Set method UPDATE"

This reverts commit c391077ed3fdce72bbea9405c796c88318ca20e7.
Several code fixes