reverted back to first version