Changed namespace and added return