Updated to match changes made by Marcello