Updated and working... i think