Minor changes. NOTE: losted work on CoA folder :(