Continuation to two previous commits..