Updated with rounded-corner eliminated