more refactoring done and also added empty round flusher