Added some changes to get COWOA working