working on fixing orientation change issue #214