Feature/now 574

same comments as the invalidate