added setup function
added setup function
merge down