updated according to Rike's wish