Updated and fixed