refacter a bit more