Added "full" mode