Change to only use weather database