Re-added Steven's components