remove shitty logic with default params