Addressed Douglas' issues