change some notation because unsure error... / align code