Fixed Groups and added idle time save