I made some improvements :))