Changes for "massive" version