Reverted back to previous design