Setters in turn
Updated DB
Merge remote-tracking branch 'origin' into dbfix