few modifications to fit more realistic domain needs