Adding multiple ray support - commit 1