much better then before and faster