changed a little here and there