Need to fix some errors