Testbranch

Removed updates before setting new ones. Nevertheless we'll need a good test of how it works in due time