Control and DB changes