Fix & addition...