cleaned up relay future
simplified future
cleanup and renaming