move [f433a8b7ca] changes into the library