Add direct communication. Make better time handling