fixing more code