Extended the parameters (m is still fixed, but that will need to go up with k as well
Merging and fixing