Working on the boundary implementation