All working copy, UI modifications required
comments added