reverted back to working version