Changed to make sure it can work in the realy world