Make it a bit more generic --kazu