Modifications with less coding.