Added "immediate" option