updated to new conventions