rewrite rotation parser for version 2.0