ive made some improvements