updated to use the same structure as Luminus