Boundaries Conditions fixed