made some changed but with errors