Reverted to manual script