just before Queue integration
after queue integration but not working