Removing engine requirement