removed some magic numbahz