Still fixing erros