Better shell tracking