updated all scripts to djalma's specifications