Updated and fixed

Updated and fixed