Finally working in deployment