cleaned up to match current scripts