add pic and some logic