Changed libraries and config

Made some changes to make it work