Updated variables to include drawer and notify