Dev. checkpoint: New design