added some stuf to logic and group