cleaner code + add xtile group