working on making it fast