Made settings more dynamic