echoed previous changes for applicable code