changed some hardcoded values to methods