Pasing: Improve Handling