Changed back to the version without objects