Improved the method and added a throttling check