[Resolved] #3; #4; #7