made some chnages when testing