some more changes! still not working, added epoche from constructor