REFACTOR: for expansive and pak 0.10