changed s to int