Removed the need for fake promises