updated with drawer