Updated and working hopefully