second lot of changes