DataManager added
//todo fix NPE