Updates on code to fix.