FULLY WORKS NOW