Rita has to test and bugfix