Updated to Version 3