Feature/now 244

I probably had a separate param at some point so thus the separation, that can be easily updated