updated info function
merged conflicts