Started working on optimization