Still trying to fix params