still fixing mistakes