Feature/scatter