Improved with ajax page refresh