some changes, block pattern, fixed paths