reverted back to the old way (still doesn't work)