removed branching & added TODO