Changed code because causing issues with group

Need to be discussed tomorrow …