updated to new api with more settings