more more basic changes