Moved funcs to commands