Edit: Factor/To do/Performance

Describe this revision: