Reverted back to original design