Updated to the newest version of Options-Framework and moved a function