bonna - refactored methods to work properly