Fixed the data location and moved the dataless outside of the event loop