improved MPass parsing