null bug fixed && switched to prodiction