Added Hamdan's sprint 2 changes