I thought that this two functions make two different thing and keep them separate is a good idea.