Changes made by jejefcgb