Big update. orientation works