including vito's modifications