changed slightly