finished but for comments