modified hardcoded things