some changes to annotations, changes and rip