relieved some hard-coded values