Updated with custom settings