add getByUser & refomatted