fixed part3.1