introduced many bugs......

check notes