primitives working again
back to normal, sorry for the mess