code refactoring - fixed PrimaDona methods