Make the lib fit. Fix write back