massive simplification by using intermediate submission view