still trying to fix some errors