Refactored hawk loop