user script re-works 2