working on Logic section