chaning some things   now a lot of errors