FIX Int instead of str