Working version before DataHandler modification