added groupid
Removed non-sense stuff