switched to proper modular library