Updated for second usage - Thanks Ofer.