updates that suit me. Based on use in the CUCC project