modal added and finished