Working on faster implementation, added TO-DO