added groups and new node functionality