Update and tested seems to be working