Make it work with other branches