added more settings functionality