some notes
merged
fixed import error