Changed to dynamic data and added completion mark.