Starting to work on update
More updates to using CIE
More updates