Tried to improve :(