Updated libraries to work with last chosen