more closely match original UI