Still more changes need to be made