Improving rondao's file