lucho's modifications