Changes for better WILLCAGE project-fu