Added even more information to cage finding