add comments, remote use less fields/ methods