Reverted back to simplicity.