Reverted back to working version