Attempt at fixing errors
Attempt to fix errors 2