Reverted back to prev flawless presentation