updated with settings controls