Feature/gh 4 sandbar