Adding joe rossi's stuff