Made some changes, added new libraries