Updated Cassian Andor model