Submitted version 2.5