fixed hardcoded things