Removed complicated voodo stuff splice. Needs to be simpler