Change method name and looks better