Added changes from ElementalX

Added new code changes from ElementalX Kernel.