code update for SammyDavisJr