Script updates...not yet working properly