removed hardcoded elements