Just trying to make it… and improve