acceptor implemented
added more to acceptor
merged