added better boundary data