pacman branch from choi5983