Improve pan a bit