Change back to int