Got lock working and funnel working and remove rank id