reverted back to working code in development