last changes, added viewport