need to fix the clear all function