Started working on performance functionality