little changes from rejected branch