Replaced hardcoded variables