Incorporate Steven's concerns