added portrait / landscape distinction