[sprint 47 some modifications]