First attempt at correct data handler