trying to improve it even more