fixed the sending and all