Moved to a three factor design