updated to be better than before