replaced constant values with those from settings