combining some branches together

.