Refactor to int :)