Reverting back to non-memory allocated version