Added Latches and some assertions