20140617 - Improved orientation setup implementation