Added boundary condition. Some other stuff? ^CSS