done dev for part3