still fixing the previous errors