Changes for compiling, pointer errors
Without objects