Seems to work, converted other library files too