modded library just a bit