improve availability mapping even further