fix architecture,  move parsing to mark class