data stuff improved