Started implementation of step two