source and notes added