Next part of updated scripts