merged some notes