Updated to 3 part version