remove hardcode and added new fuel crate