incorporate changes made by cape-IT