begin addressing expansion toggle issue