updates on both scripts