updated with settings