Quick and dirty modification.