Attempted improvements