Updated to submitted version