Portion of the code that conflicted with Rae's