Script update

Requested changes made excluding the (still in progress) loop