finished fixing code
finished fixing code