Updated code to not make get requests when it doesn't need to.