Trying to improve a bit