Second Commit, added modulo
fixed merging problem