added sun
merging