forgot to get rid of some parameters