updated for my case