SifBox: Another merge