I'll refactor entire file and change this as well