Again updated to be better