Acceptor fix

changed variables names, etc..