Use the new temporary method