Trying to fix any errors v2