I believe everything is fixed in the code