Small modifications + pastes