Integrated watch with shell, fixed bug for small blocks