Making it local friendly